Merge pull request #390 from vikramkanigiri/at/unify_bakery_locks_v2

author Achin Gupta <[email protected]>

Mon, 14 Sep 2015 20:49:10 +0000 (21:49 +0100)

committer Achin Gupta <[email protected]>

Mon, 14 Sep 2015 20:49:10 +0000 (21:49 +0100)
author Achin Gupta <[email protected]>
Mon, 14 Sep 2015 20:49:10 +0000 (21:49 +0100)
committer Achin Gupta <[email protected]>
Mon, 14 Sep 2015 20:49:10 +0000 (21:49 +0100)
diff --cc include/bl31/services/psci.h
Simple merge
diff --cc include/plat/arm/common/arm_def.h
Simple merge
author	Achin Gupta <[email protected]>
	Mon, 14 Sep 2015 20:49:10 +0000 (21:49 +0100)
committer	Achin Gupta <[email protected]>
	Mon, 14 Sep 2015 20:49:10 +0000 (21:49 +0100)
		1	2
include/bl31/services/psci.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/plat/arm/common/arm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history